Tukaiz develop

True but I don't think this is terrible. A good solution for now.