dependencies fixed
add rewrites