Preparing to final release - stage 6