Reverted to session + prettyness update