Final changes made, ready for deployment