Updated branch. Some additions