Revised functions, pushing to Pi