some additions I wanted for myself