Refactored Albert-bricks