minor modofications