Some uncommited changes