updated for my needs