Minor updates
Properly assign