removed todo about scalability