a little bit of changes