added number stuff to later intergrate