rachels fixes implemented