Realigned to latest stack skeleton