v3
Fixed some issues