Changed to less logic