Swtich to 4.0 framework