Moved back to syncronous validate functions