Modified for A3640 pleasure