Began work on optimization