Refactored bin