updated jade logic