small changes, and removed pid ;)