Fixed Session and formatting