updated links and 'user'