Some rewrites and changes