Reworked version of the original design from March this year