fixing authentication & authorization in progress