Removed retry code and added comments, prepared for submission