added poopie and poopie logic