Revision #2 (Mikael's comments)