Updated with more Square goodness