making more generic home pt 2