Removed previous troublesome version of course