Improved and finalized SOS mode