Changed function names to new ones, testing coming soon :).