initial
performance improvement and monitoring
merge with github