Added stub functions and new goals