Incorporated Both Forms into one