Some old uncommited changes