We spent a lot of time on some fixes and hacks. Hopefully we roll out a better version in the future XD
