Quick Fix for the tutorial (Will need to be changed)