Just some dirty modifications