Reaz 18 commit

Reaz 17 commit