Full edit on ig/ fadedaf7