APC would be way cooler but lets see what we can do
I would go with the APC 20. You're basically getting way more direct control of Live. Preferably, I would say to go with the APC 40 OR if you have an iPad, I highly suggest the $30 TouchAble app (I consider it to be better than the APC 40).
Bookmarks