working on improving views