reworked architecture

mstayer attack fixed