Another level, some more improvements