fixed underscore, stripped out moving code