working update with a better code with links added