Initial commit
few changes