adjust structure + fix compile error