slight suffle and fix for amazon