updated with jamod