Changes to support the 50 line limit