refactored to work without meteorite