removed not neccessary checks