broken calling conventions
merge
changed timing prints