made domain generic and improved link switch