Simplified the action system