Changes wrt Ohms comments