Reworked on my Mac