modified for new web design
added to deal with new design
updated for new design