Extending 06cc1df1ee for SN