Uncoupled speed from frequency, added more options