Added ACTION and other stuff, can't think straight, too tired.