SOme improvements