hopefully sucessfully reorganized source