more changes to make this a generic family ap