IMPROVED : Order in changes