Revision #1 (Mikael's comments)