WIP
Finished improvements