jus updated with comments