Finished 209 devise revised

#318