integration with devise part 2, still under working