improved skeleton files