Usman's changes