some change, need to figure out link functionality