a bit of changes