SOme final changes