more un-hardcoding