Finally got all actions happy and working