Adding Jaas back in