Get() refactoring

optimization of waiting