Adding trips and shapes