Changes before demo