Adding more controller logic