Started incorporating MB and MT's comments