finally done (expanded editing)