New updates including Hammad part