Reverted to non-trigger approach