Final Changes before carl changes