Added functionality, but without the flash message.