adding latest revisions (still WIP)