Added and fixed for jonathan