removed extra function