remove harcoding of numbers