Uncommented Noam's code

Sorry