re-organized the order of contents