Added a couple tricks from Justin