final Matt Changes before launch