Modified for remy2