Moved the modifs for 2.0 (from mircea-negreanu.github.io)