Restructoring and adding jill