Some revisions (will be merged in final commit)