Added threading and increased click-count