MOre work on entry