some more derivative stuff added