rewrites and making things better :)