Fixed issue, added authentication code