Commented out daniel code.