semi-final layout edit
rm redundunt