added devise
merged