Change logic flow