Tremor: Refactored to work with updated api.