minor changes to bring it back to working state