Made some changes, still needs to work