fix time script
Merge branch 'master' into tub
test case
remove tub, fix basis projection
cleaned up
fix basis