Michael: changes action functions, should work now