Slight change in logging order to vew data properly