erased some duplicated code