Done. Improved in new commit.