removed error check