just fixing bugs in 2-system site