Minor adjustments for make it work