Changed pins and removed cycles