Victor's changes with some tweaks