added progress bar and merged with Andre