#132 - Updates from comments