work on entry mapping