Change some definitions around a bit
Change variable representation