some changes on generic.core