working on time performance
fixed poor time performance
cleaning a little bit
Merge branch 'master' into temp
Merge branch 'temp'