Major changes to Activity processing