Second comm, couple of changes