Structure change for better understandig