Random Changes before overhaul