removed uneccesary checks