minor changes on mechanism