Updated with devise