updated to include some devise stuffers