Big update it's working