1.4 removed unnecessary stuff