sightly faster
forget to remove test section
remove duplicate code