changed some things, not working yet, but its too late