Resetted code due to crashes and build failtures