refactored more custom/get/post calls