update, almost there