Fixed home_space addressing. Not fully tested yet