Shafer returns home, joins GSDP