removing error checking code (whoops!)