fixed singleton tuple bug, added Calum's input