changed few things