lots a updates
new controller