Upadted the code by jamseer
Merged data from sujai