changed design/code