Working implementation + 2 actions