minor changes + timer