Initial commit
Some changes