Made important changes

Doesn't hang up.