Front end, clouds fix