some minor changes v2