Modified steps 1-5 for devise