fixed necessary changes