Last changes I made before ditching.