Proper Update to source

Carrying over missing function definitions