Working issues (31/33)

Working issues