Major updates for new image