Added and fixed