changelog updated as well