Commented out not relevant sections