final playeractions changes (merged branches)