Align simple version with deluxe branch