Updated to actual working version of file