Functions changed for beta, just need to finish output