JENTRATA - updated custom version