Dev

fixed validation due to comments