refactored HMFsite back in