Added back deleted functions - Sorry Taylor!
Added back deleted functions with new additions