Changed numeric to int and float