merged with yulle's amazon part and fixed repo