Fixed a few things... removed deprecated call