Add barrbora changes, for backup