commented out a couple of lines just for now