removed some validation