Updated Singer to use subdivisons