Add change return logic