160530 : FIXES TO BE MADE (PREVIEW)