Changes before moving to github