Refactored details before merge