utility functions
fixed conflict
fixed conflict