Update Apex + trying tweaks