Updated to use HOME_DIR