improved libs watch