updated with the current layout and continued modularity