Another refactored bits