Removed comments and added progress handler