Updated with RegExt and Messages