Commited Dan Wong's changes