Modified again to get it right this time finally!!!!