added some dirty code