updated code 17-09-2014