added the names, adjusted the stuff