refactored Entry