First commit
small changes