Added stack names and switch zero-based