Added functionality for JR