Did Some optimizing