The commented out lines here can be removed now