Added Math and other stuff