moved logic to show where it should be.