Second commit, minor changes