updated for new rules