added actions and dispatcher
merged conflicts