minor modification, commit with mouse debug off