Changes to get ready for final