updated for JafierRoms