Added non-graphical functions