Updated to target framework 3.5