changed a few things... t should work now