removed null guards