improvements to methods
Merge branch 'temp'