finally fixed
Finishing up