Working issues (20/33)

Working issues