Adn if clause for dict and remove test shit