updated 2 -  24-12-14 from kamal