this should have been taken care by original models