Undoing swo changes
Bug fixes