Hopefully gotten rid of massive filesize