added following link, a lot of other changes as well