renamed functions accordingly to name