verious updates as requested by Rachel,Mario and Salvatore