Refactored last entry