Whatsup - Minor modifications