Edited single mode (not working though)