Updated with new content from web project