Working issues (22/33)

Working issues