Made a bit of changes