Reaz 17 commit

Reaz 16 commit