Sorry for the delay - Big Update