Dev is once again the master.

made better, post some code review.