Main Form Updated v2