Minor changes, trying to get the procs working