some changes, just to be perfect