Finished discussion + minor changes