Added back commented-out method, as per Matei's request