some small changes to make everything more harmony