Final version?

Still have to check that INVALID FUNCTION error