Revamped. only a few minor changes though.