fix marty stuff