Cam improvement
additional unstaged changes