adding back stuff that was ignored