changing wrapper to match index