removed view modes
redid ds stuff