tweaking this until I can determine a fix