Changes to help + validation function