Added Tom's assignment