Changed to use helper await helper methods