Repost of the update that i did