switching option things around, done soon