Lets go back to what was working...