small changes for main_ on Milner
merge