Quick improvements