Less hacky function calls