more leo stufffs almost done :)