updating two mode, removing depedencies