- extensive changes to make drawing on other accounts work