Thank you for all the work put into this change. Hopefully constructive criticism can make it even better!