Custom Entry Order Improvements?