change structure and add presentation
delete space