[WIP] Increase stability

DO NOT MERGE