max site not required anymore + fix state transfer problem