changed to devons solution