Modified to match changes to M4