Updated to follow common cconventions