barbaz' changes