fixed update mutex actions
merging
finished part b
merging