removed some checks