erm, some changes