Edited macro chapter and added discussion chapter