Updated for JEE7