Changes incorporating FloatCanvas