More work on new entry...