Added 'and' functionality (working)