and finished edit v2