some dirty changes