improved definitions