add now behaving better