some things to fix on this partial