Silenced unused parameter warnings
Added timeout dialog
Fixed conflict (I think)