@pokai thanks! a lot of the ch…

@pokai thanks! a lot of the changes were in the works already by the internal team and although there are some changes that we helped with.