Incorporating Tauhid's writing first run.