Name now replaces current thing we need to fix this