working version with links added