some changes I did a long time ago