some edit for performance