removed extra functions