Modifying tasks to use sockets
Minor edits