fix structures and try other design