Working issues (30/33)

Working issues