made compatible with Stackato v3