Dirty tweaks - more tries