Adding .functions and new PS alternatives