Refactored, especially for ABM-250