some changes regarding right structure size