some better changes