added a little progress and button clicking safety