removed unnecassary checks