Few uncommited changes

Don't remember