popup logistics

another changes to logic