fixed zuker, changed everything