updated for olympia