lot of modify for more views