One more change: makes size work