Updates...
Merging with MB's changes...