Refactor: general.[version 7]