Another attempt for correct rewrites... still not working