final commit 27/6/14