Changed and added more info