re-added stuff that was not committed and lost...