Drawing is up properly, rewriting functions