update to modern style