minor controller changes inc. moving method call
Merge branch 'kellybranch'