Changes to authenticate and first
changes to first