update changelog + move around a function