Removed faulty optimized version