re-edited layout