Changes to make it runnable