working changes 23/09/14