Modifiactions to make it run