test improved
controller improvements