UPDATE | locale fix | made simple