Updated to run from myself