completed with new layout and DB