Preparation for new version of Gisto