added c6
added return to c5 and added java7