Change logic again