Finally updated after awhile. The final version. This is what you asked for.