Updated Poppy to work