Clean up and function addition
Additions