Started Adding more advanced behavior