Added data validation! yes!