Changed something to better validate