[1030889] Refactored