updated to match main line