removed the uselless code that doidn't work