All functions are now functional