Adding more basic logic