requested tweaks from victor