Cindy's code, for real this time