More tweaking due to barfage