fixed all and no stupid new instances