added simplex and more stuff