changes from rast branch