Second Commit

First was not enough. HAD  to make some changes=)