added site, fixed lifecycle