some crappy changes: need to ask friend how to get around problem.