Working on fixing BASE_PATH