Refine2

Merging better branch into master