changed names + inlined function