updated to fullfill mmolina/sun/oracle recomendations