Updates to get optimax working right?
working on optimax...