debug
more fixin