Last Changes before release demo