revamped and fine tuned