changes to try and include a busy indicator