matches functionality. branches can probably be merged now