Merge reworked branch