final commit 21/7/14