removed unnecessary stuff II