Update christian's commented code