Small Changes to make it work