Update langugae and rearrange rules