More inline edits - still buggy...