cleaned up 7.1