Added regular setup