removed some error checks