some restructurization...