temporarily commented out problematic code.  need to remove this commit once the problem code is sorted...