Working issues (32/33)

Working issues