Update 2.0

Working finally, still speed issues.