Added Auth-Logic