tidying this up to the simplest thing I can make it