added homestead support