removed prevent default ifs