First commit
startup changes