Added back accidentally reverted API Function Stuff