Andrei's mods
final