Tweaking st slightly. Will probably modify more when I have time.