First attempt at updating to decent format