Possibly final version
Added links