did some mod according to Bene's suggestion. Ready to be merged/ and dep...

...loy for the first time