added a few tricks