Updated to be more verbose