Changes based on jibran review