added waits on Eclipse layer