move to 6.0 target, cleanup method name, add carrier detection