removed some stupid if's