Same as before, but hopefully more refined. Any and all suggestions are welcome.