fixing foundation issues
Merge branch 'PTwork'