Last changes pointed out by dave has been included