Updated to include devise authentication