removed annoying function