Hard coded more to make things better