Working issues (24/33)

Working issues