Added another helper function
Fixed fake merge conflict