final commit 22/7/14