Updated all number returns to cast to string