Now works with analog controls