Added new and updated old functions