Here are some modificatiosn