change dependecy and some minor changes