updated with stubs of code