not finished: temporary changes to plotting-related code