Updated with latest controller library code