change sessions to work appropriately