updated with devise