First changes and BASE_PATH