added stuff that was left out