removed nogata and optimized