merged in comments