tal's changes :)
blah
attempt conflict fixes
post tal