Updated changelog
Re-order methods