Usman's code merge