Modifying the latest version from Ahmad