Working issues (27/33)

Working issues