Boujee Fix Enhancements