wip
fix controller bug
merge sendy