This branch is for submission to ApJ