Fixed and Tested version