fixed rewrites, implemented overrides