final tweeks of version 1
final tweek