Huge work on fo checkout