Changes according to JPs comments