Commented out the unnecessary portions