some changes I forgot ;)