Change order and action hook to avoid breaking everything :)