removed null return