preparing more skeleton for the new version