stashing changes
stashing changes
added some debug info and return_type