Made changes

Reinstated some functions for general elegance