Final changes for Susanne; ready for delpoyment