some changes to make the stuff working