Added code for nicer figures