Really fix the homesick structure