Added and fixed to update