cleaned up 7