removed that checking here