Some old uncommited changes just for history