enhancement and fixed path