updated 1 -  24-12-14 from kamal