Reverted to in-thread drawing