some changes ... now it should work