new Commit By Hamza version 2