possibly final commit before dropping the old canvas code