Updated version, made preview optional