tweakes for v1.2