Edits sessions correctly now

Please test and break it.