Make this variables more exact so they wont fail in the future