Minor modofications