yet again, many changes