Updated with log and controller