Need test, performance, enhance view