changes to make local running possible