working on new version ..