Make the non-working skeleton work