replaced bloated function with -define()