Actually, this whole method could be removed