perf updates
Fixed mass assignment problem