added comments and a safety select to prevent blocking