Commented out temporarily unnecessary portions