Now it's exactly according to the book

but still not linking :P