removed safety returns