Working issues (8/33)

Working issues