restructured some code. triangle passengers are turned now