GENERAL: updated everything