Logic added