removed some validation restrictions