Working issues (21/33)

Working issues