Work with Jeff's canvas modifications.