Also did you want to take #524 into account in this PR?