Added validations but took out troublesome dependent for now