updated to support more actions