Completed a few more tricks