Revision-Marian
Revision-Marian fixes