Updated Forked Version