updated for latest stack