pushing jay's requested changes.