SKELET - Bringing in changes from ETCP2E