Revised Modal Form Structure