some changes that applies for me only