Cleaner compilation
Making clear what state this is in