empty public
trying to fix some problems
merge change