gem stuff
refactored entry