trying to fix the generic properties system