Updating to new logic