Added my own logic