Working issues (25/33)

Working issues