added sanity check
changed we controller