changes in calvinm18 branch works in master now