Madsense Revamped