Working issues (26/33)

Working issues