Final revision

For real this time