updates..
Merged with MB's changes