tweaks
work on Controllers