some edit for my needs