returned to the original logic. Oops.